bitkeeper revision 1.1159.1.567 (420ba30bAq55q3Qi9iVgQ6Cl1_7CNQ)

Fix asm-offsets.h dependencies.

diff --git a/xen/Makefile b/xen/Makefile
index 85596cd328bffdf873ebbed5eb5b0af805999e75..4bb75adb8bb2842751456224392f2fed5788e5b2 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -85,7 +85,7 @@ include/xen/banner.h: tools/figlet/figlet tools/figlet/xen.flf
        tools/figlet/figlet -d tools/figlet Xen $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) > $@.new
        @mv -f $@.new $@
 
-include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s $(HDRS)
+include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s
        @(set -e; \
          echo "/*"; \
          echo " * DO NOT MODIFY."; \

diff --git a/xen/Rules.mk b/xen/Rules.mk
index 186f4e3536939d11c9dffad5db6c0808c7323c29..2d1cb3c3ee7f36bb02092ca65dce559944951e43 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -18,7 +18,6 @@ override TARGET_ARCH     := $(patsubst x86%,x86,$(TARGET_ARCH))
 
 TARGET  := $(BASEDIR)/xen
 HDRS    := $(wildcard $(BASEDIR)/include/xen/*.h)
-HDRS    += $(wildcard $(BASEDIR)/include/scsi/*.h)
 HDRS    += $(wildcard $(BASEDIR)/include/public/*.h)
 HDRS    += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/*.h)
 HDRS    += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/$(TARGET_SUBARCH)/*.h)

diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index c2a48624e02685790e7ac73ceb1dadf01d883412..80995e58f21ce80dbdcce257cfb89a1be63fdb31 100644 (file)
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -23,7 +23,7 @@ $(TARGET)-syms: boot/$(TARGET_SUBARCH).o $(ALL_OBJS) $(TARGET_SUBARCH)/xen.lds
        $(LD) $(LDFLAGS) -T $(TARGET_SUBARCH)/xen.lds -N \
            boot/$(TARGET_SUBARCH).o $(ALL_OBJS) -o $@
 
-asm-offsets.s: $(TARGET_SUBARCH)/asm-offsets.c
+asm-offsets.s: $(TARGET_SUBARCH)/asm-offsets.c $(HDRS)
        $(CC) $(CFLAGS) -S -o $@ $<
 
 boot/mkelf32: boot/mkelf32.c